Substitute gdkx.h => gdkprivate.h since we need to accesss only

Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
	we need to accesss only ->children. We need an accessor
	for the children.

	* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
	DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
	to get rid of gdkx.h include.

	* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
	and random references to 'None'.

	* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
	Get rid of unused #include <gdk/gdkx.h>

	* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
	gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
	gdkconfig.h.

diff --git a/ChangeLog b/ChangeLog
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d928678cfacb818c3966a0ba81106914e3eee889..4a3543a20f88c6618e895a44c893014d7af49a1f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
+       we need to accesss only ->children. We need an accessor
+       for the children.
+
+       * gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
+       DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
+       to get rid of gdkx.h include.
+       
+       * gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
+       and random references to 'None'.
+
+       * gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
+       Get rid of unused #include <gdk/gdkx.h>
+
+       * gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
+       gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
+       gdkconfig.h.
+
 1999-11-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdraw.c

diff --git a/gdk/x11/.cvsignore b/gdk/x11/.cvsignore
index 2c2b76093787a6db5b8265f215ebde293bcc7849..10f8f3eec33df9ed1984abd94cf33b4314d9648d 100644 (file)
--- a/gdk/x11/.cvsignore
+++ b/gdk/x11/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 _libs
 .libs
 libgdk-x11.la
+gxid

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index d6a72419541be0e6e2fc6efcf8d1b84e7c402977..0e2e0ecc8c334cad5230a723007469d064e12b8b 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -32,7 +32,6 @@
 #include "gtkclist.h"
 #include "gtkbindings.h"
 #include "gtkdnd.h"
-#include "gdkx.h"
 #include <gdk/gdkkeysyms.h>
 
 /* length of button_actions array */

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index b5a7465fd864a5df3c22857e69f115bbb606c5aa..98325722255a48c6720cf5626f2e78f7274a4fb4 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -33,7 +33,6 @@
 #include "gtkbindings.h"
 #include "gtkmain.h"
 #include "gtkdnd.h"
-#include "gdkx.h"
 #include <gdk/gdkkeysyms.h>
 
 #define PM_SIZE                    8
@@ -708,7 +707,7 @@ gtk_ctree_realize (GtkWidget *widget)
   if (ctree->line_style == GTK_CTREE_LINES_DOTTED)
     {
       gdk_gc_set_line_attributes (ctree->lines_gc, 1, 
-                                 GDK_LINE_ON_OFF_DASH, None, None);
+                                 GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
       gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
     }
 }
@@ -5346,18 +5345,18 @@ gtk_ctree_set_line_style (GtkCTree          *ctree,
        case GTK_CTREE_LINES_SOLID:
          if (GTK_WIDGET_REALIZED (ctree))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
-                                       None, None);
+                                       GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
        case GTK_CTREE_LINES_DOTTED:
          if (GTK_WIDGET_REALIZED (ctree))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, 
-                                       GDK_LINE_ON_OFF_DASH, None, None);
+                                       GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
          gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
          break;
        case GTK_CTREE_LINES_TABBED:
          if (GTK_WIDGET_REALIZED (ctree))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
-                                       None, None);
+                                       GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
        case GTK_CTREE_LINES_NONE:
          break;

diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index cc68976ba94774275532e4c06b197b8bd0d77e72..ec4cd314e8622b1db4994b7e9adfac17f2a50980 100644 (file)
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -26,9 +26,6 @@
 
 #include <ctype.h>
 #include <string.h>
-#ifdef USE_XIM
-#include "gdkx.h"
-#endif
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
 #include "gtkeditable.h"

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 15bd74595f9eabe45d7e81f700b52567b22cf513..b9bbe125f3150558248abd89646d038c6edf5d77 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -26,7 +26,6 @@
  */
 
 #include <stdlib.h>
-#include "gdkx.h"
 #include "gtkhandlebox.h"
 #include "gtkmain.h"
 #include "gtksignal.h"
@@ -1026,7 +1025,7 @@ gtk_handle_box_motion (GtkWidget      *widget,
    */
   new_x = 0;
   new_y = 0;
-  gdk_window_get_pointer (GDK_ROOT_PARENT(), &new_x, &new_y, NULL);
+  gdk_window_get_pointer (NULL, &new_x, &new_y, NULL);
   new_x += hb->float_allocation.x;
   new_y += hb->float_allocation.y;
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 94a5b621fa0f4a4ff04d9692d344465f5638dcd3..d1b8da1df579a5019f40928a9d29aa6e1944cb24 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -24,8 +24,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gdkx.h"              /* For GDK_WINDOWING */
-
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlocale.h>       /* so we get the right setlocale */
 #else

diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index a2c4419c928b80e2e41327e8a787b93a4f6380a0..ebe90a339aeeb1b592e86fc18da469014da37dc8 100644 (file)
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -32,7 +32,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#include "gdkx.h"
 #include "gdk/gdkrgb.h"
 #include "gtkpreview.h"
 #include "gtksignal.h"

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index f390693f347c4376b14b195da3908b34781a3c58..6f492baa5660b2b477ed25bfd2fd452a86fb528d 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include "gdkx.h"
-
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlocale.h>       /* so we get the right setlocale */
 #else

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 8c3b2d3ad46d6591ad91f1585309824570e0e1e2..eb3c652a9b3d5d1b2855976957992f5a452d350e 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -53,8 +53,7 @@
 
 #include <stdarg.h>
 #include <string.h>
-#include "gdkx.h"
-/* we need this for gdk_window_lookup() */
+#include "gdkx.h"              /* For gdk_window_lookup() */
 #include "gtkmain.h"
 #include "gtkselection.h"
 #include "gtksignal.h"

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 35693a68beb035b977e74ea7a543a16029d1b195..36cf93e46c8c2492c3e8312ed98aa8e9465274c9 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -36,7 +36,7 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gdk/gdk.h"
-#include "gdkx.h"
+#include "gdkprivate.h"                /* Used in gtk_reset_shapes_recurse to avoid copy */
 
 
 #define WIDGET_CLASS(w)         GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
@@ -4784,9 +4784,6 @@ gtk_reset_shapes_recurse (GtkWidget *widget,
 
   private = (GdkWindowPrivate*) window;
 
-  /* FIXME: We do we need this check? */
-  if (GDK_DRAWABLE_DESTROYED (window))
-    return;
   gdk_window_get_user_data (window, &data);
   if (data != widget)
     return;

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2310b5ce9c7c24d61115d8bb6ef6c8846d2e22a3..29ce4afc992efed980bec48f397c43b5280ddc27 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
-#include "gdkx.h"
+#include "gdkx.h"              /* For gdk_progclass */
 #include "gtkprivate.h"
 #include "gtkrc.h"
 #include "gtksignal.h"

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index a2b6a78dea9c8649986ae55b4d3015e696ab68d0..6a63cef7f021e428683983c1051a5934282571e7 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -6575,8 +6575,6 @@ create_dnd (void)
  * Shaped Windows
  */
 
-static GdkWindow *root_win = NULL;
-
 typedef struct _cursoroffset {gint x,y;} CursorOffset;
 
 static void
@@ -6621,7 +6619,7 @@ shape_motion (GtkWidget      *widget,
    * Can't use event->x / event->y here 
    * because I need absolute coordinates.
    */
-  gdk_window_get_pointer (root_win, &xp, &yp, &mask);
+  gdk_window_get_pointer (NULL, &xp, &yp, &mask);
   gtk_widget_set_uposition (widget, xp  - p->x, yp  - p->y);
 }
 
@@ -6697,8 +6695,6 @@ create_shapes (void)
   static GtkWidget *sheets = NULL;
   static GtkWidget *rings = NULL;
 
-  root_win = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
-
   if (!modeller)
     {
       modeller = shape_create_icon ("Modeller.xpm",

diff --git a/tests/testgtk.c b/tests/testgtk.c
index a2b6a78dea9c8649986ae55b4d3015e696ab68d0..6a63cef7f021e428683983c1051a5934282571e7 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -6575,8 +6575,6 @@ create_dnd (void)
  * Shaped Windows
  */
 
-static GdkWindow *root_win = NULL;
-
 typedef struct _cursoroffset {gint x,y;} CursorOffset;
 
 static void
@@ -6621,7 +6619,7 @@ shape_motion (GtkWidget      *widget,
    * Can't use event->x / event->y here 
    * because I need absolute coordinates.
    */
-  gdk_window_get_pointer (root_win, &xp, &yp, &mask);
+  gdk_window_get_pointer (NULL, &xp, &yp, &mask);
   gtk_widget_set_uposition (widget, xp  - p->x, yp  - p->y);
 }
 
@@ -6697,8 +6695,6 @@ create_shapes (void)
   static GtkWidget *sheets = NULL;
   static GtkWidget *rings = NULL;
 
-  root_win = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
-
   if (!modeller)
     {
       modeller = shape_create_icon ("Modeller.xpm",